Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 07:10:35 +0000 (00:10 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 07:10:35 +0000 (00:10 -0700)
commit374ea4e04ae722e0946f123e6654a1fdd502ef09
treedbbb4919c251ceb49d52acc8e71dfc91094b4dda
parentbbc02ff50e9c8a0972c42fe0e2f636e21c64dc27
parentbb30de4d7a555c62b6db6b5053267cbf7c127512
Merge from trunk.